Fix typo and reorder
Make it more Java 8