Adding some todo's and code cleanup