Refactoring: removed unnecessary attributes & todo comments