Handle default Value correctly. And remove some System.out messages
4 files changed