organize imports
tweak Eclipse compiler warnings