Added a default messages.yml; Cleaned up some code in the main class