Style and usability simplifications