Style and hlint changes