Monster commit to optimize imports and pick a consistent coding style. Closes #32