Just doing some code inspection/cleanup.  Also: HAAAAAAAAAANDS