cleaned up a bit ;)