method cleanups