Remove todos
less cluttered
Make less use of bold
layout