TROIA-285 - Fixed formatting issues