- some reformatting, removed some unneeded scripts and functions