Fixed broken comments
Formatted source code