WIP Style modifications. Refactor next.