Organized usings and updated TODOs