fixed issues with whitespaces