Trailing spaces removed
Code optimization