Cleaned up last commit, as requested