Organize styles better