Warnings fixed
Trailing space removed