Cleaned stuff up to prep for submission