Cleaned up sources