Style fixes, remove old comments