No new features, just refactoring and commenting