Refactor - clean code + renaming + TODO notes