Cleaned up picture code a little.