restructured - removed redundant solutions