simplify

Look for opportunities to simplify the code base.