Removed Trailing whitespaces and fixed code style