Didn't follow singleton pattern. Added Javadoc