Cleanup code base after Brian's review