Improved some code issue description/reformatted some files.