refactor/clean

renames and internal structure simplification (arrays and hashes)
fix comments