Fixed issue: Minor fixes and cleanup