More Cleanup

Cleanup and refactor.