Uncommented some code and minor layout changes