Cleaning up some extra space