Cleaned up from the last commit