Code Cleanup

Yeah :D