Some refactoring and add commits by date