Cleaned
todo added