clean up config code && trailing spaces

as it is