Cleanedthe code... again...