Removed redundant code and changed styling slightly