White space changes
added some more TODO's
Changes as per PR