(cleanup) major improve readability
add TODO for user comments