minor refactoring/TODO implementation, adding propper log4j logging