Fixed the formatting errors introduced by Astyle. Changed the comment syntax to use a more Astyle-friendly one.