Fixed a few awful practices