minor code editing / cleanup