A bit more stylcop love