Code clean-up

Some minor code clean-up.