Refactor code-style

Also a tiny fix: `data`, `position` are now cloned and made correct, not just
referenced.

Author: wooorm