* shortened some method names
* updated todo
* removed accidental file