Remove whitespace
Fix function names
Rename main php file to match plugin