2 shapes! code cleaned up