Further work on naming and formatting. /cc @jbeemster