deleted unnecessary code, its still messy but better