removal of trailing spaces / addition of basic settings handling