organize code readability a bit