Cleaning up some code
Fix PhpExcel plugin