Applied formatting changes from develop