Shifted code style

- Cleaned up all source to prepare for possible move to scala