Cleaning up code, adding todos