Added update checker; Removed unused code; Added javadoc