TODO item done
Nicer comments
Nicer comments layout