Fixed Some clean up