Cleanup and more references added