remove old commented code, fix indentation