Some styling fixes, removed commented out stuff.