More Section Clean up, couple of cosmetic changes