commented shortening code, it's just causing issues