Cleaned source code and some formatting issues.