Fixed up some formatting

Commented out unnecessary functions