Re-organise / clean up styles