Code Cleanup Switch

v0.2.3