1) code cleanups