* Remove test stuff
* Code formatting?