Cleaned some things up

Encrypt still does nothing and it's really wierding me out