Cleaned up for submission