remove stupid from code and add smart