Add hint, minor cleanup