code cleanup, tips for user