Cleaning up. Removed unnecessary variables and cleaned comments.