Some refactoring
Minor balance tweaks