Clean up some styles and code