refactoring and misc styling
such a fail