Code beautification - made in line with rest of code (final variables,
use of curly brackets, specified generic arguments).