Minor updates to improve formatting and code comments
Commented out deprecated functions