Cleaned up comits