Various clean ups. Removed redundancies, made more consistent and more accurate.