Code cleaned up.
More code cleanup