correcting documentation
removing all the declarations outside the actual class
fixing some coding standard issues
removing the duplicated cells