Small refactor to styles. Variables implemented