adding style changes and planning TODO