Refactoring all account based information out. And finished static code styling