Clean up code
Apply astyle
Revert incorrect initialisation