Change style, clean up functionality