Cleaned up Company.js & Owner.js, but may have introduced a bug...