Cleaned the source code