Minor formatting/naming/commenting changes, no changes to funktionality (I hope)