Added remove function and organize