Cleaned up the puzzle in Solar Array