renamed some vars, removed goto labels, new lines and comments