let's really clean up that code, shall we?