Various little style mod
Minor changes