easier readability and cleanup