More hands comments and refactoring variable names