file clean up and commenting