Added some sound effects and cleaned up code