Cleaned everything up for submission