Better style and usability