Merged Classes and renamed
Clean up
Fixed access to plugin instance
Made comments look nicer.