Took out commented code, improvements