Took care of TODOs