Background handled, code cleaned