Cleaned Up, Added Functions