Edit design and changed names of few method and variables