Removed a few lines
Moved comment to a correct position