hint + cleanups