- Remove some unused code, renamed some methods, + ToDo list