more code cleanup, added installDate