Small changes and cleanup