Cleanup and commented