Removed redundancies and enhanced appearance