Cleaned up some more