replace hardcoded strings, change methods returnValues from void to boolean, refactoring