Reviewed code, made refactoring, added/removed some TODOs

- made some renaming to enhance redability