Cleaned up a bit, gained some space