cheezy fighting, code cleanups