Made Netbeans happy by changed fields to final
Moved an import to its correct place