Code clean-up for user files