Issue #111

Quick require code cleanup