Fixed issue: Minor cleanup