cleaned up indentations and fiexed script/bootstrap