Little update and cleanup