updated song of the week and cleaned up code