cleaning up styling and functioning