Added user table. Code cleanup.