Reformatted  code, removed useless, audio works