Refactored and optimised stylesheets