added todo items and cleaned up code