Code comments and tidy

Variable renaming