Code cleanup and Audio Class WIP