Cleaned up last commit