Fixed some formatting issues (thanks to SensioLabsInsight)