Code cleanup. No functionality added/removed