Clean-up Code, Added Initialization Functions