After eggrobin's review
Cleanup
Cleanup