Cleanup, TODO section added