Cleaned source code