Removing duplicate styling and code clean up