- Cleaned up source