Added basic formatting