remove trailing spaces
remove weird extra code?