clean-up: remove System.err.println() call
clean-up: avoid methods taking nullable arguments