Cleaned up Code

Changed variable names, made enemies take damage again