fixes / cleanup
fixes / cleanup

kingsj/music-player,kingsj/music-player,albertz/music-player,kingsj/music-player,albertz/music-player,albertz/music-player,kingsj/music-player,kingsj/music-player,albertz/music-player,albertz/music-player,albertz/music-player