Fixing few formatting issues