Some formatting updates
Task B done...Thank you Christian xD