Refactored based on Dan and Zyed's comments

Do not use block comments.