cleaned up and generic some info