Combining Shapes and Code Cleanup