Aesthetic changes, including removing commented code (FOR SHAME)