Small changes and better structure