Clean up, comments, such readable wowwow