Some clean up and important TODO added