Lot more code duplication reduction for issue #33
Fixes for checkstyle