refactoring and fixed bug with getstarted