clean commit, after all issues solved