Code clean-up
Fix routines' lists of sources