Clean up styling.. though it is still terrible