Cleaned up a bit ;)