Removed unnecessary comments and attempted to fix -e glitch