Issue 10 adding formatting