Some major cleaning of the code, commenting of the code, layout and style streamlining