cleaned-up source file