Added audio and cleaned up some code