cleaned up more :p

credit to battleguard for optimization help