improved translation + cleanup

See #22