Add more comments
Cleanup