No need for a description here
Cleanups and more comments