Code clean up and fix o+