Refactor, Cleanup & Added Todos