Code Cleanup

Simple code cleanup, will do more later.