Fixed errors, improved naming