cleaned up with todos
cleaned