Unnecessary break statement and TODO comments removed from straight.py