Cleaned up straight in master