Fix formatting and makdown

Use Makarov tips to fix formatting code