Code clean-up

Dealt with some syncing errors.