Did some cleanup too , renamed the two shapes to match name convention.