first clean commit
cleaner code