removing unnecessary changes; commenting view logic