Formatted code and cleaned up comments to comply with PHPDocumentor
Formatted and cleaned up code