Code cleanup.
Working on CreateDatabase method.