No real changes, only minor code clean up