Removed comments and got rid of unnecessary variables