Started refactoring all the comments and code within the project o be more consistent.
Further refactoring of core files.