Revert "Optimising the code by fixing var-declaration, indent-error-flow, increment-decrement, superfluous-else"#4