Removed unused imports, switched some final field to static, modified order (Sonar tweaks)

Signed-off-by: William Lebel <lebelwilliam@gmail.com>