Code cleanup, bgm added