Cleaned up use of fig / axes