Small changes and clean up