Stylistic changes

Use Java 7's diamonds since this is a 7 project
Array initializers instead of allocate-then-initialize
Remove some of the odd linebreaks