Small changes and clean