Tweaked some stuff to follow best practices