use log4j plugin + code cleanup