removed clutter. reduced header sizes