Clean up some methods
Add uninstall command
PSR fixes