changed func declarations to PSR-2 standard, really must change my editor...