Refactor models & style a bit