Refactor style and loading of data