Cleaned up pictures organization