Louis | remove comments and small refactoring