improve code readability, remove unnecessary functions