Code formatting improvements after Scrutinizer check