Fix nits and remove start indicators