Cleaned up some ugliness