Code Cleanup

#4