Cleanup and added come comment