Restructure styles
Properly indent properties