Comments and some Refactoring