Declaration code improved