better documentation, cleaning, organizing