minimal changes to make code cleaner