#34 Cleaned sources