Optimize imports
Replace some System.out for calls to log4j