Cleaned up code and set + to change to - when expanded.