Basic styling some stuff
Merge remote-tracking branch 'origin/source'