Adjust styling and remove unnecessary code