cleanup vars and documented methods