Start using FunctionalJava in some places

Signed-off-by: Ricky Elrod <ricky@elrod.me>
Make line length a bit more reasonable

Signed-off-by: Ricky Elrod <ricky@elrod.me>