Comments

Comments
Minor refactoring