a bit cleaup