Removed redundancy and lines not needed.