Tackled a set of TODOs in code