Changed title, removed commented code