Fixed issue: Cleanup whitespaces