Clean up get/set methods, add cross and dot