make core code more readable