format code & clean up
Merge branch 'mine' of https://github.com/zexilonoxiouz/Superuser.git into mine