refactor style and update some things