Cleanup

* Simplified build procedure
* Re-indented code
* Corrected styling of switch-element