mainly cosmetic changes for better formatting