code refactoring, mostly styling