Removed duplicated code.
#34 Cancellable commands
Invoked the Rearranger utility on all files in the core module.