Maven having trouble with an extra closing brace. Also general cleanup to remove unneccessary whitespace and commented lines.