Performance improvements, comments translated to english