Did some minor refactoring on the initialization of the Entry object.