Mess cleaning
- typos