Just made some more fixes, it is kind of difficult to completely avoid cliches.