code cleanup, more lispy