Tested plugin. Commands work. Cleaning up the code.