Fixed whitepsace issues