Cleaning up and adding some CSS styling