Completed styling
Merge remote-tracking branch 'origin/styling' into styling