cleanup/refactor, adjust some styles