Cleanup of some asthetics