Cleaned up some stuff quick