Clean commit

Commit based on previous commit suggestions