some minor fixing / cleanup