Fixed whitespaces issue