Updated minor code changes