Better var names, fix whitespace