Reduced line lengths; removed unnecessary local final modifiers