Shortened EnchantmentWithLevel's name
Update moved methods
Clean up JavaDoc
Cleaning up code