Removed old variables, removed useless commented code, comments translated in english