cleanup and better formatting
cleanup and better formatting

vxvinh1511/suncalc,radio412/suncalc,AlekseyMartynov/suncalc,Art/suncalc,jck000/suncalc,randomite/suncalc,OSMBuildings/suncalc,mourner/suncalc