Updated comments and removed todo's