Refractoring, removal of useless lines, starting the cleanup of commands and captions.