fix & refactor functional stuff
fix let
remove comments