Made various style changes
Made various style changes