A little bit more Refactoring
	... I'm not even sure everything still works, though.