Removed unnecessary text view implementation and renamed some variable and files