Fix for Unnecessary spaces used