Cleaned-up sources