Removed banmaster
Refactored some things, corrected indentation etc..