Cleaned up the pic scaffold