Improve stylesheet structure