Fixed: Some code cleanup.