Remove not needed stuff and improve naming