optimized formatting
Merge commit 'ceab250'