Minor cleanup + uncommenting some code