Cleaned up commit