Some minor changes for better format