Code cleanup, removed warnings.