make core more readable