Proposed changes

A little code review with some proposed optimization/cleanup changes.