remote trailing whitespace
Fix some warnings