Minor modifications according to the Effective Java Chapter #2 and #3