Alexandre's code review. Add doc comments