Final update and cleaned up