Cleaned Source Code