Small changes. Cleanup code.