code checker / cleanups