Cleaned up gallery usage