Removed extra comments, minor refactor work